Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the inconsistency of AxisMax and AxisMin #2177

Merged
merged 1 commit into from
Feb 21, 2017

Conversation

aelam
Copy link
Contributor

@aelam aelam commented Feb 20, 2017

When enabled autoScale.
data.calcMinMaxY(fromX: self.lowestVisibleX, toX: self.highestVisibleX) is called after
_leftYAxisRenderer?.computeAxis(min: _leftAxis._axisMinimum, max: _leftAxis._axisMaximum, inverted: _leftAxis.isInverted)
_rightYAxisRenderer?.computeAxis(min: _rightAxis._axisMinimum, max: _rightAxis._axisMaximum, inverted: _rightAxis.isInverted)
_xAxisRenderer?.computeAxis(min: _xAxis._axisMinimum, max: _xAxis._axisMaximum, inverted: false)

that means _leftAxisRenderer and _rightAxisRenderer will render AxisLines and Values based on old values of _axisMinimum, _axisMaximum

When enabled autoScale.
`data.calcMinMaxY(fromX: self.lowestVisibleX, toX: self.highestVisibleX)` is called after 
` _leftYAxisRenderer?.computeAxis(min: _leftAxis._axisMinimum, max: _leftAxis._axisMaximum, inverted: _leftAxis.isInverted)`
`_rightYAxisRenderer?.computeAxis(min: _rightAxis._axisMinimum, max: _rightAxis._axisMaximum, inverted: _rightAxis.isInverted)`
`_xAxisRenderer?.computeAxis(min: _xAxis._axisMinimum, max: _xAxis._axisMaximum, inverted: false)`

that means _leftAxisRenderer and _rightAxisRenderer will render AxisLines and Values based on old values of _axisMinimum, _axisMaximum
@codecov-io
Copy link

Codecov Report

Merging #2177 into master will increase coverage by 0.14%.
The diff coverage is 60%.

@@            Coverage Diff             @@
##           master    #2177      +/-   ##
==========================================
+ Coverage   18.41%   18.56%   +0.14%     
==========================================
  Files         124      124              
  Lines       14600    14490     -110     
==========================================
+ Hits         2689     2690       +1     
+ Misses      11911    11800     -111
Impacted Files Coverage Δ
Source/Charts/Charts/BarLineChartViewBase.swift 24.82% <60%> (+1.75%)
Source/Charts/Charts/PieRadarChartViewBase.swift 0% <ø> (ø)
Source/Charts/Utils/Platform.swift 15.38% <ø> (+2.05%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1c24532...cbead46. Read the comment docs.

@liuxuan30
Copy link
Member

liuxuan30 commented Feb 21, 2017

We need to understand the context. Any issues to track?
I saw a few reports regards autoScaleMinMaxEnabled, I'm not sure if they all are related.

@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

Yeah, exactly.
the main point is when is the data.calcMinMaxY(fromX: self.lowestVisibleX, toX: self.highestVisibleX) called

@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

Do you have a minute, we talk on gitter

@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

I've found maybe it's the reason of #2053

@danielgindi
Copy link
Collaborator

This IS an issue.
@liuxuan30 can you find affected issues and close them? We have too many I can't get a handle on them...

@danielgindi danielgindi merged commit 09a89cc into ChartsOrg:master Feb 21, 2017
danielgindi added a commit to danielgindi/MPAndroidChart that referenced this pull request Feb 21, 2017
@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

@dannielgindi , since the android version has the same problem and this PR is accepted. Do you need to make sure android version use the same solution?

@danielgindi
Copy link
Collaborator

Nope, I trust that the behavior is the same on both :-)

@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

I mean Android version has the same bug. Do you need to tell PhilJay to sync the code

@danielgindi
Copy link
Collaborator

I've already committed the change to the android version. Please look 4 lines above...

@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

Sorry, I was on mobile phone. Anyway that's great !

@aelam
Copy link
Contributor Author

aelam commented Feb 21, 2017

I found your PR to android version is a bit different from this
the autoScale() is after
mAxisRendererLeft.computeAxis(mAxisLeft.mAxisMinimum, mAxisLeft.mAxisMaximum, mAxisLeft.isInverted());
mAxisLeft.mAxisMinimum and mAxisLeft.mAxisMaximum could be changed in autoScale()?
If I'm right, it will still have some render problems

@danielgindi
Copy link
Collaborator

I think that the autoScale should be after computer axis, and before the renderers.
Why did you move it before computeAxis?

@aelam
Copy link
Contributor Author

aelam commented Feb 22, 2017

Let's go through this again
if autoScale is after compute axis

  1. _leftYAxisRenderer?.computeAxis(min: _leftAxis._axisMinimum, max: _leftAxis._axisMaximum, inverted: _leftAxis.isInverted)
    the entries of YAxis are determined and drawn
    We can know there is a range for leftYAxis <-- these values are old

  2. autoScale() is called
    look into the steps of autoScale()
    In data.calcMinMaxY(fromX: self.lowestVisibleX, toX: self.highestVisibleX), _leftAxisMax/Min the new range of LeftYAxis are recalculated. <-- these values are new

  3. renderer?.drawData(context: context) bases on the new Range while AxisRenderer render AxisData based on the old range

That still leads the inconsistency

Correct me if I am wrong

@danielgindi
Copy link
Collaborator

Okay, looking more closely at the situation - you're right. I'll apply the right fix

@liuxuan30
Copy link
Member

I will try to find related issues to close. Just have baby to take care, so I may have a long delay time

@danielgindi
Copy link
Collaborator

@liuxuan30 Congratulations :-) That's a good reason for not having free time, and that's my main reason!

@liuxuan30
Copy link
Member

Just linked the open issues that mentioned autoScaleMinMaxEnabled, however some of them seem different issue.
I used to imagine I could finally do some work in the midnight, but now I just can't help going to sleep right after babysitting, lol

plackemacher pushed a commit to plackemacher/MPAndroidChart that referenced this pull request Mar 1, 2017
PeterSrost pushed a commit to sokol8/Charts that referenced this pull request Oct 31, 2018
Fixed the inconsistency of AxisMax and AxisMin
regas99 pushed a commit to regas99/MPAndroidChart that referenced this pull request Apr 1, 2019
ysravankumar added a commit to ysravankumar/MPAndroidChart that referenced this pull request Feb 16, 2021
* Extend test cases (for bugfix)

* Remove unused local variable

* Removed redundancies

* Fixed entry searching algorithm to handle sequential same values

* Move on from the deprecated property in the demos

* Avoid crash for `centerAxisLabelsEnabled` when entry count == 1

* Fixes for cubic bezier edges

* Removed redundant condition

* Update gradle

* Guard `roundToNextSignificant` and `decimal` from invalids

* Minor fixes for interval in axis labels

* Allow label centering for 1 label

* Set z-index of markers to be the highest

* [FIX] not find centeringEnabled

* Extend test cases

* Refactoring, prepare example for testing highlight

* Fix typo

* Corrected calcMinMaxY for autoScaleMinMax

* Feature: spaceMin/spaceMax for axis

* Default spaceMin/spaceMax for bar charts

This avoids having to set custom axisMinimum/axisMaximum, or offsetting x

* Improved highlight for scatter/bubble, and fixes highlightValueWithX

* Avoid crash when dataset is empty

* Update gradle & android sdk

* Default spaceMin/max for xAxis in candlestick charts

* Fixed last label of line chart not rendering

* Fixed bar chart demo first value being empty

* Clear up grouped bar example

* Make highlightFullBarEnabled feature work again

* Update README.md

* Update README.md

* Update README.md

* Move to Realm v2.0.2, update example

* Migrate to Realm v2.0.2, fix example

* Update AxisBase.java

Mistake fixed

* Make automatically disabling slice-spacing an opt-in feature

* Bugfix: Corrected clipRect on the proper rect variable

* Fixed glitch in clipping rects.

It's the Android's renderer's bug.
When specifying exact clipping rects,
  they are clipping more than they should!
So drawing a thin 1px line on the edge of a clipping rect fail.
Instead of insetting by half the line width, inset by full line width.

* Renamed new property getter

* Added `clipValuesToContent` property for clipping values

* Added missing isDrawBordersEnabled getter

* Fixed weird glitch in mixed (pos/neg) stacked bars highlight

ChartsOrg/Charts#1744
ChartsOrg/Charts#1726

* Fixed double calculation of xAxis spacing

* Fix: typo for October

* Gradle updates

* Fixed EPSILON. (Closes PhilJay#2432)

Closes PhilJay#2424
Closes PhilJay#2394
Closes PhilJay#2393
Closes PhilJay#2385

* Added IndexAxisValueFormatter, to allow for easy x-axis labels like MPAndroidChart 2.0

* Fixed a bug where the mod-360 bypass draws a full-circle for 0 slices.

* Upgrade version

* Upgrade manifest

* Update README.md

* Update README.md

* Update README.md

* drawBottomYLabelEntryEnabled

* Gradle updates

* resetZoom()

* Correctly position 0 in stacked bar

* Fix for default text size being set in PX instead of DP

The default text size in ComponentBase was defined as 10 pixels
instead of 10dp, which causes tiny text and does not reflect
the javadoc and the general behavior of setTextSize(...)

* Fix circles inherit alpha (Fixes PhilJay#2620)

ISSUE:
When using multiple LineDataSets like the follows:

    int solidColor = 0xFFFF00FF;
    dataSet.setColor(solidColor);
    dataSet.setCircleColor(solidColor);

    int semiTransparentColor = 0x8A000000;
    fadedSet.setColor(semiTransparentColor);

    LineData data = new LineData(dataSet, fadedSet);

the circles in 'dataSet' will rendered with the alpha from
fadedSet (0x8A).

The reason for this is that mRenderPaint is not reset properly
before drawing the circles. The first time drawCircles is called
the imageCache.fill(...) method is used where the color is set by
mRenderPaint.setColor(set.getCircleColor(i)), restoring the alpha
to 0xFF. The second time homever, imageCache.fill(...) is not called
which means that mRenderPaint will use it's old color/alpha,
which in this case is from fadedSet.

TEST INFO:
To trigger the issue, add the following to LineChartActivity1:

    final ArrayList<Entry> fadedEntries = new ArrayList<>();
    for (int i = 0; i < count; i++) {

        float val = (float) (Math.random() * range) + 3;
        fadedEntries.add(new Entry(i, val));
    }
    final LineDataSet fadedDateSet = new LineDataSet(fadedEntries, "Faded");
    fadedDateSet.setColor(0x42000000);

    dataSets.add(fadedDateSet); // add the datasets

and launch the first item in the example app.

SOLUTION:
This commit replaces mRenderPaint with null when drawing the circle
bitmap. If circleColor has been defined with a semi-transparent
color, it will be drawn that way in the cached bitmap, hence the the
bitmap itself does not need to be drawn with an alpha.

* fix tests for java executable location. bug PhilJay#2805
PhilJay#2805

* fix PhilJay#2813

* Implemented icon support

* Added examples for icon entries

* Improved feb29 formula

* Moved auto scale before render of axis lines

ChartsOrg/Charts#2177

* Consider isEnabled in more axis rendering cases

* Fix for missing setters in getInstance method

The zoomAndCenterAnimated method in BarLineChartBase crashes with a NullPointer exception because the yAxis variable is null when onAnimationUpdate is called. The yAxis is null because of missing setters in the getInstance method of AnimatedZoomJob.

* Update README.md

* Update README.md

* Update README.md

* Updating versions

* Remove line width minimum constraint

* Update README.md

* Update README.md

* Update README.md

* Clear lastHighlighted when `clear` is called

* Create LICENSE

* Fix some potential NPEs with WeakReference usage

Even if the WeakReference field is not null, the contained value may be null.  Additionally, you always need a strong reference to the value to ensure it isn't garbage collected while you're using it.

* Update README.md

* Update README.md

* Run view port jobs after applying changes

* Add default x spacing (half width) for scatter chart as well

* Fix CombinedChartView not drawing markers

* Allow locking drag on either axes

* add option to draw limit lines on top of data

* Refactored LargeValueFormatter

* Update README.md

* Update gradle and dependencies

* Out comment gradle wrapper

* Update maven android plugin

* Add maven plugin to example

* Add new google repo

* Add new google repo

* Update README.md

* Update version

* Update README.md

* Update README.md

* Added option to set restrictions for Y axis autoscaling.

* Update gitignore, add assets

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Add files via upload

* Delete googlee1205ea43aa2c32a.html

* Avoid that the last label entry in the x-labels clip off the edge of the screen PhilJay#3819

* Add option for using slice color as value line color

Fixes: PhilJay#3897

* Rename RadarChartActivitry to RadarChartActivity

* Remove unused imports

* Remove Custom Check

calculate() no longer checks if min and max is custom, it just adds the padding.

* update to Android Studio 3.1.2

* Create ISSUE_TEMPLATE.md

* Create PULL_REQUEST_TEMPLATE.md

* refactor(EasingFunction): Simplified EasingFunction

EasingFunction has been simplified greatly, and I've added a MUCH needed
annotation to relevant methods.

Easing.EasingOptions has been deprecated, as well as any methods using
them. Converting is as simple as deleting the "EasingOptions" part.

A new signature is available for animateXY()!

You are now able to pass one EasingFunction to animateXY() if you want
both axes to be animated the same way.

Quietly included are some gradle build updates, incrementing the
appcompat version to 27.1.1, and using the new `javacompiler` to avoid
deprecation of `javacompile`

* fix(docs): Broken Contributing link

* Update issue templates

* Downgrade ISSUE_TEMPLATE.md to generic issue

* Update Bug_report.md

quick fix

* Update CONTRIBUTING.md

Condensed CONTRIBUTING and added helpful reference links.

And cake!

* Update README.md

* Delete lingering MyEasingFunction.java

I made the decision to remove this file instead of updating it, as I'm
sure most will instead prefer to look at the actual Easing class. If you
miss this example class... ¯\_(ツ)_/¯

* - multiple gradient color

* docs(templates): Update Issue & PR templates

I've updated the issue and pull request templates, again. This time I
looked to the node.js request library for inspiration.

It's no secret that this project has been attracting a LOT of very
low-quality issues. Almost all are asking questions that can be easily
answered if the person looked at the example project or the wiki.

Specifically, the new Support_help.md file.

This file will hopefully bait these low-quality support questions and
reduce the number of opened issues regarding debugging or support
significantly.

I've updated the default ISSUE_TEMPLATE.md to be a copy of Bug_report.md
to force people to read that notice text if they decide to not choose
any of the templates.

* chore(template): Move templates to .github folder

* Update and reorganise copy data sets methods (Fix for PhilJay#1604).

Copying class properties is always done in protected copy method.

* Fixed code review comments.

* Remove mLabelRotatedHeight counted twice, when calculating legend offsets. (Fix for PhilJay#2369).

Removed statements where completely not needed as calculating offsets is alredy done in BarLineCharBase#calculateOffsets(...)

* Fixed Javadoc

* Remove redundant findViewById casts, that became obsolete after migration to API 26.

* docs(README): Update & simplify README

- Re-ordered some of the sections
- Simplified some sections
- Reformatted here and there
- Added a few emojis, how cute!

The goal of this change was to hopefully further reduce the amount of
issue support/ question spam. By moving the sections around to show the
more important parts higher up, like usage and documentation links, I
hope this will make it easier for people to find the documentation.

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Huge Project Refresh

Before anyone freaks out, all these changes are under-the-hood, meaning that you probably won't even notice them at all.

The biggest difference is raising the minSdkVersion from 9 to 14. Recently android bumped this number interally as there are basically no devices running lower than 14 anymore. Sorry but you are just wasting your time if you are trying to support anything lower than 14 now.

The next biggest change is updating the project to the new AndroidX libraries, which changes some imports and nothing else really.

The third biggest change is fixing a few bugs in the code that cause values to be drawn even if there are none, which results in your app crashing. Surprisingly, these checks already existed in a few of the newer chart types, but most lacked this simple check.

Other than those three changes, nothing else is functionally different. Well, saving to gallery works on all charts in the example app now, and you can quickly see the code for each example in the menus.

The only real potential "breaking" change is that charts are now saved as PNGs by default instead of JPGs if you go the route of not specifying as a JPG. You may want to double check your file sizes as PNGs can be larger than low quality JPGs.

I still have more plans for simplifying the API and fixing other issues with the project, for the small few that closely pay attention to individual commits: there's going to be more soon.

* More Linting

Lots of things in the example app are now marked with the 'final' modifier, and saveToGallery() is protected in classes that implement it. As well, new suppressions are in a few places.

NEW text is now removed completely. Looks like this has been unused for a long time and it's just stuck around anyway.

* More Cleanup

I've removed the realm examples, mainly because the library was buggy.
In the previous commit, I already removed the examples from the list
since they didn't add anything to the overall demonstration. I thought
that if anyone wants to use realm.io with the charts, they can see the
actual library.

The file structure has been updated to match how Android Studio does
things. Some files added way back when have been deleted as they don't
do anything but cause the linter to freak out about 'unused properties'

All 'build.gradle' files have been refreshed as well.

Small addition to the README file to add a quick way to reach sections
of the page.

* Bump version to 3.1.0-alpha

* Fix link error

* New ValueFormatter

I created a simplified value formatter class, which is an abstract class rather
than an interface.

The switch was chosen because the new format has all the methods predefined
(something an interface wouldn't allow) meaning you can extend it and only
change what you want. This also means that you only need one value formatting
class for labels rather than two different classes, it just makes more sense.

Please check the method signatures to learn how to use them, I'm sure you'll
find this new format is much more customizable and faster to use.

I've made the class abstract even though there are no abstract methods or
fields, this is because it would certainly be a mistake to create a
ValueFormatter and not override any methods.

To convert existing code, just use 'extends' instead of 'implements' and change
the names to 'ValueFormatter'. You'll need to change the methods you overwrite
as well, just check the class and use the one you need.

* Remove Deprecated Things

Long deprecated Legend constructor and positioning has been removed, it was
replaced with a new way to position the Legend.

The old Easing options have been removed now, accessing them is as easy as
removing the `EasingOption` part, such that the names look like
`Easing.Linear` or `Easing.EaseInOutQuad` now.

* Remove unnecessary API checks

Also added run configuration for the MPChartExample.
Removed deprecated Legend stuff.

* Add Curved Slices to Pie Chart

Finally added support for rounded slices, and somewhat improved the code
for the PieChartRenderer class.

* Add option to set minimum angles

Allows to force minimum slice angles when drawing charts, which means that any
slices with angles lower than the minimum will be drawn with the minimum angle.

When changing this setting on the fly, you have to call
`notifyDataSetChanged()` and `invalidate()` for the minimum angle to take
effect.

This only functions if all slices can be drawn with the minimum angle. For
example if a chart has 5 slices, the largest functioning minimum angle is
`72f` degrees on a 360 degree chart, or 20% of the chart's `maxAngle`.

* Update README.md

* Update Bug_report.md

* Update Feature_request.md

* Update Support_help.md

* Minor changes to project and example

* New example app release

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* PercentFormatter: make space between number and percent sign optional

* fix little typo

* Update gradle

* Create FUNDING.yml

* Update FUNDING.yml

* Update README.md

* Safe guards

These will be even more important when moving to Kotlin ranges

* Added highlightColor parameter for pie charts

ChartsOrg/Charts#2961

* Consider axis dependency in Combined chart

ChartsOrg/Charts#2874

* Added an implementation of Douglas Peucker with resultCount input

ChartsOrg/Charts#2848

* Fixed axis label disappearing when zooming in

ChartsOrg/Charts#3132

* Make min/max axis labels configurable

ChartsOrg/Charts#2894

* Avoid race condition for interval/intervalMagnitude

ChartsOrg/Charts#2377

* Custom text alignment for no-data

ChartsOrg/Charts#3199

* Select correct axis for legend distance calculation in horz bar chart

ChartsOrg/Charts#2214

* Use correct color index for bubble chart

ChartsOrg/Charts#3202

* Added dataIndex param for highlightValue (combined charts)

ChartsOrg/Charts#2852

* Reset min/max when clearing ChartDataSet

ChartsOrg/Charts#3265

* Call notifyDataChanged for an opportunity for subclasses

* Add a warning message if pie chart has more than one data set

ChartsOrg/Charts#3286

* Add option to disable clipping data to contentRect

ChartsOrg/Charts#3360

* Support for labelXOffset for YAxis label

* This is for the inline bubble selection

ChartsOrg/Charts#3548

* Fixed index out of bounds issue when using stacked bar chart

ChartsOrg/Charts@b03cf16

* Improve min/max calculation

ChartsOrg/Charts#3650

* Call onChartScale listener after double-tap-zoom

ChartsOrg/Charts#3770

* Multiple colors for valueline

ChartsOrg/Charts#3709

* Renamed values -> entries for consistency

ChartsOrg/Charts#3847

* Improved negative offset for horz bar chart

ChartsOrg/Charts#3854

* maxHeight didn't account for the last label

ChartsOrg/Charts#3900

* Fixed a bug where a pie slice without highlight enabled is hidden

ChartsOrg/Charts#3969

* Remove unexpected dash line during linear animation

ChartsOrg/Charts#4094

* Corrected check for line in vertical bounds

ChartsOrg/Charts#4100

* Finalized vertical line collision check

* Fixed merge residue

* Implement a more generic Fill class instead of GradientColor

Support HorizontalBarChart too.

* Update LICENSE

The LICENSE file was not properly filled out. It was missing some templates that were supposed to be filled in at the end of the license.  Additionally, the entire Apache 2.0 license is not required on a project that makes use of it. Only this disclaimer is required.

See http://www.apache.org/licenses/LICENSE-2.0#apply under the "How to apply the Apache License to your work" for more information.

* fix NPE when use solid color with barchart

* Update BarChartRenderer.java

* Update HorizontalBarChartRenderer.java

* Update BarChartRenderer.java

* Update README.md

* Update README.md

* Update README.md

* Update LICENSE

* Revert: e5b6619 - bring back polymorphism to value formatters

If anyone does not know how to add a space or change the format in anyway,
please learn how to subclass.

* Update README.md

* Update README.md

Co-authored-by: PhilJay <[email protected]>
Co-authored-by: Voicu <[email protected]>
Co-authored-by: Daniel Cohen Gindi <[email protected]>
Co-authored-by: Mark <[email protected]>
Co-authored-by: nielsz <[email protected]>
Co-authored-by: Evgeniy <[email protected]>
Co-authored-by: Mahesh Gaya <[email protected]>
Co-authored-by: Patrick Ivarsson <[email protected]>
Co-authored-by: travisfw <none@none>
Co-authored-by: Stephen McBride <[email protected]>
Co-authored-by: Scott Kennedy <[email protected]>
Co-authored-by: davidgoli <[email protected]>
Co-authored-by: Maxim Pestryakov <[email protected]>
Co-authored-by: Pawel Grzybek <[email protected]>
Co-authored-by: zhanglong <[email protected]>
Co-authored-by: sembozdemir <[email protected]>
Co-authored-by: Wilder Pereira <[email protected]>
Co-authored-by: almic <[email protected]>
Co-authored-by: Hannes Achleitner <[email protected]>
Co-authored-by: Anirut Teerabut <[email protected]>
Co-authored-by: RobertZagorski <[email protected]>
Co-authored-by: duchampdev <[email protected]>
Co-authored-by: Nathan Fiscaletti <[email protected]>
Co-authored-by: Anirut Teerabut <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants